From 919be04a3df4d7e198e14751024ac91b52d3e553 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 14 Nov 2015 17:33:00 -0500 Subject: [PATCH] Adwaita: Fix selection styling in flow boxes This was broken by recent selection styling changes. --- gtk/theme/Adwaita/_common.scss | 4 ++++ gtk/theme/Adwaita/gtk-contained-dark.css | 11 +++++++---- gtk/theme/Adwaita/gtk-contained.css | 11 +++++++---- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 519ca12a28..4fe3157fce 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -127,6 +127,10 @@ rubberband { flowbox { & rubberband { @extend rubberband; } + & flowboxchild { + padding: 2px; + &:selected { @extend %selected_items; } + } } label { diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index b37f335456..f61f4fb3e7 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -81,6 +81,9 @@ treeview.view rubberband, border: 1px solid #184472; background-color: rgba(24, 68, 114, 0.2); } +flowbox flowboxchild { + padding: 2px; } + label.separator { color: #eeeeec; } label.separator:backdrop { @@ -4455,20 +4458,20 @@ headerbar.selection-mode button.titlebutton, textview text selection, textview text selection:focus, .view selection, -.view selection:focus, label selection, label selection:focus, label selection:hover, .grid-child:selected, entry selection, spinbutton selection, entry selection:focus, spinbutton selection:focus, modelbutton.flat:selected, +.view selection:focus, flowbox flowboxchild:selected, label selection, label selection:focus, label selection:hover, .grid-child:selected, entry selection, spinbutton selection, entry selection:focus, spinbutton selection:focus, modelbutton.flat:selected, .menuitem.button.flat:selected, treeview.view:selected, row:selected, .sidebar :selected { background-color: #215d9c; color: #ffffff; } textview text selection:insensitive, - .view selection:insensitive, label selection:insensitive, .grid-child:insensitive:selected, entry selection:insensitive, spinbutton selection:insensitive, modelbutton.flat:insensitive:selected, + .view selection:insensitive, flowbox flowboxchild:insensitive:selected, label selection:insensitive, .grid-child:insensitive:selected, entry selection:insensitive, spinbutton selection:insensitive, modelbutton.flat:insensitive:selected, .menuitem.button.flat:insensitive:selected, treeview.view:insensitive:selected, row:insensitive:selected, .sidebar :insensitive:selected, placessidebar row:selected:insensitive label { color: #90aece; } textview text selection:backdrop, - .view selection:backdrop, label selection:backdrop, .grid-child:backdrop:selected, entry selection:backdrop, spinbutton selection:backdrop, modelbutton.flat:backdrop:selected, + .view selection:backdrop, flowbox flowboxchild:backdrop:selected, label selection:backdrop, .grid-child:backdrop:selected, entry selection:backdrop, spinbutton selection:backdrop, modelbutton.flat:backdrop:selected, .menuitem.button.flat:backdrop:selected, treeview.view:backdrop:selected, row:backdrop:selected, .sidebar :backdrop:selected { color: #ffffff; } textview text selection:backdrop:insensitive, - .view selection:backdrop:insensitive, label selection:backdrop:insensitive, .grid-child:backdrop:insensitive:selected, entry selection:backdrop:insensitive, spinbutton selection:backdrop:insensitive, modelbutton.flat:backdrop:insensitive:selected, + .view selection:backdrop:insensitive, flowbox flowboxchild:backdrop:insensitive:selected, label selection:backdrop:insensitive, .grid-child:backdrop:insensitive:selected, entry selection:backdrop:insensitive, spinbutton selection:backdrop:insensitive, modelbutton.flat:backdrop:insensitive:selected, .menuitem.button.flat:backdrop:insensitive:selected, treeview.view:backdrop:insensitive:selected, row:backdrop:insensitive:selected, .sidebar :backdrop:insensitive:selected, placessidebar row:selected:insensitive label:backdrop, placessidebar row:selected:backdrop:insensitive label { color: #648eba; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 623508b567..2f57d2cf6a 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -81,6 +81,9 @@ treeview.view rubberband, border: 1px solid #2a76c6; background-color: rgba(42, 118, 198, 0.2); } +flowbox flowboxchild { + padding: 2px; } + label.separator { color: #2e3436; } label.separator:backdrop { @@ -4627,21 +4630,21 @@ headerbar.selection-mode button.titlebutton, textview text selection, textview text selection:focus, .view selection, -.view selection:focus, label selection, label selection:focus, label selection:hover, .grid-child:selected, entry selection, spinbutton selection, entry selection:focus, spinbutton selection:focus, modelbutton.flat:selected, +.view selection:focus, flowbox flowboxchild:selected, label selection, label selection:focus, label selection:hover, .grid-child:selected, entry selection, spinbutton selection, entry selection:focus, spinbutton selection:focus, modelbutton.flat:selected, .menuitem.button.flat:selected, treeview.view:selected, row:selected, .sidebar :selected { background-color: #4a90d9; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); } textview text selection:insensitive, - .view selection:insensitive, label selection:insensitive, .grid-child:insensitive:selected, entry selection:insensitive, spinbutton selection:insensitive, modelbutton.flat:insensitive:selected, + .view selection:insensitive, flowbox flowboxchild:insensitive:selected, label selection:insensitive, .grid-child:insensitive:selected, entry selection:insensitive, spinbutton selection:insensitive, modelbutton.flat:insensitive:selected, .menuitem.button.flat:insensitive:selected, treeview.view:insensitive:selected, row:insensitive:selected, .sidebar :insensitive:selected, placessidebar row:selected:insensitive label { color: #a5c8ec; } textview text selection:backdrop, - .view selection:backdrop, label selection:backdrop, .grid-child:backdrop:selected, entry selection:backdrop, spinbutton selection:backdrop, modelbutton.flat:backdrop:selected, + .view selection:backdrop, flowbox flowboxchild:backdrop:selected, label selection:backdrop, .grid-child:backdrop:selected, entry selection:backdrop, spinbutton selection:backdrop, modelbutton.flat:backdrop:selected, .menuitem.button.flat:backdrop:selected, treeview.view:backdrop:selected, row:backdrop:selected, .sidebar :backdrop:selected { color: #ffffff; } textview text selection:backdrop:insensitive, - .view selection:backdrop:insensitive, label selection:backdrop:insensitive, .grid-child:backdrop:insensitive:selected, entry selection:backdrop:insensitive, spinbutton selection:backdrop:insensitive, modelbutton.flat:backdrop:insensitive:selected, + .view selection:backdrop:insensitive, flowbox flowboxchild:backdrop:insensitive:selected, label selection:backdrop:insensitive, .grid-child:backdrop:insensitive:selected, entry selection:backdrop:insensitive, spinbutton selection:backdrop:insensitive, modelbutton.flat:backdrop:insensitive:selected, .menuitem.button.flat:backdrop:insensitive:selected, treeview.view:backdrop:insensitive:selected, row:backdrop:insensitive:selected, .sidebar :backdrop:insensitive:selected, placessidebar row:selected:insensitive label:backdrop, placessidebar row:selected:backdrop:insensitive label { color: #80b1e4; } -- 2.30.2